From 00792184008d5e93cdca09af7fac48a9070ab54c Mon Sep 17 00:00:00 2001 From: "Aaron M. Ucko" Date: Wed, 1 Dec 2021 21:37:42 -0500 Subject: [PATCH] Support x32 Avoid picking up wrong inline assembly. Gbp-Pq: Name support_x32 --- c++/include/corelib/impl/ncbi_atomic_defs.h | 2 +- c++/src/build-system/configure | 2 +- c++/src/build-system/configure.ac | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/c++/include/corelib/impl/ncbi_atomic_defs.h b/c++/include/corelib/impl/ncbi_atomic_defs.h index 0b27f946..30ca025b 100644 --- a/c++/include/corelib/impl/ncbi_atomic_defs.h +++ b/c++/include/corelib/impl/ncbi_atomic_defs.h @@ -120,7 +120,7 @@ extern "C" { (defined(__i386) || defined(__sparc) || defined(__x86_64) || \ defined(__aarch64__)) && \ (!defined(__GLIBCXX__) || !defined(NCBI_TCHECK)) -# if defined(__x86_64) || defined(__aarch64__) +# if (defined(__x86_64) && !defined(_ILP32)) || defined(__aarch64__) # define NCBI_COUNTER_64_BIT # endif # ifdef NCBI_COUNTER_64_BIT diff --git a/c++/src/build-system/configure b/c++/src/build-system/configure index 492675b4..a2c361ab 100755 --- a/c++/src/build-system/configure +++ b/c++/src/build-system/configure @@ -28265,7 +28265,7 @@ $as_echo "$as_me: WARNING: $message" >&2;} ;; darwin*:*86*:64 ) vdb_libpath=mac/$vdb_mode/x86_64/lib ;; darwin*:*86*:* ) vdb_libpath=mac/$vdb_mode/fat86/lib ;; darwin*:arm* ) vdb_libpath=mac/$vdb_mode/arm64/lib ;; - linux*:*86*:64 ) vdb_libpath=linux/$vdb_mode/x86_64/lib ;; + linux*:*86*64* ) vdb_libpath=linux/$vdb_mode/x86_64/lib ;; linux*:aarch64* ) vdb_libpath=linux/$vdb_mode/arm64/lib ;; * ) if test -n "$with_vdb"; then diff --git a/c++/src/build-system/configure.ac b/c++/src/build-system/configure.ac index 64449862..44493c35 100644 --- a/c++/src/build-system/configure.ac +++ b/c++/src/build-system/configure.ac @@ -7837,7 +7837,7 @@ if test "$with_vdb" != "no" ; then darwin*:*86*:64 ) vdb_libpath=mac/$vdb_mode/x86_64/lib ;; darwin*:*86*:* ) vdb_libpath=mac/$vdb_mode/fat86/lib ;; darwin*:arm* ) vdb_libpath=mac/$vdb_mode/arm64/lib ;; - linux*:*86*:64 ) vdb_libpath=linux/$vdb_mode/x86_64/lib ;; + linux*:*86*64* ) vdb_libpath=linux/$vdb_mode/x86_64/lib ;; linux*:aarch64* ) vdb_libpath=linux/$vdb_mode/arm64/lib ;; * ) if test -n "$with_vdb"; then -- 2.30.2